auto merge of #936 : alexcrichton/cargo/issue-923, r=brson

Closes #923

diff --cc src/cargo/ops/registry.rs
index c4fbeafaed93b3d2f796cd1261803efea64be946,462b5e4a84045853041de803e465d854f2dce3d8..e0bfc63b4f9801eb30dbfd749ce31166604d544f
--- 1/src/cargo/ops/registry.rs
--- 2/src/cargo/ops/registry.rs
+++ b/src/cargo/ops/registry.rs
@@@ -13,8 -12,9 +13,9 @@@ use core::manifest::ManifestMetadata
  use ops;
  use sources::{PathSource, RegistrySource};
  use util::config;
 -use util::{CargoResult, human, internal, ChainError, Require, ToUrl};
 +use util::{CargoResult, human, internal, ChainError, ToUrl};
  use util::config::{Config, ConfigValue, Location};
+ use util::important_paths::find_root_manifest_for_cwd;
  
  pub struct RegistryConfig {
      pub index: Option<String>,